From: Joakim Verona <joakim@verona.se>
Date: Fri, 23 Aug 2013 07:06:30 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=46ed8fdec3e2cf1f1dbb583a6ff22e27f6941ee4;p=emacs.git

merge from trunk
---

46ed8fdec3e2cf1f1dbb583a6ff22e27f6941ee4